From: Alan Mackenzie <acm@muc.de>
Date: Fri, 24 Jul 2009 12:12:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11321
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fb34e2821adfddd321aea9bd30240e89e9907d75;p=emacs.git

*** empty log message ***
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 41559f85cb5..7501648595c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-24  Alan Mackenzie  <acm@muc.de>
+
+	* cc-mode.texi (Config Basics, File Styles): Document that at mode
+	initialization, any individual variable setting now takes precedence
+	over one done via c-file-style/c-file-offsets.
+
 2009-07-21  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc.texi (Undoing Mistakes): Mention that the undo list will be